Merge "Use assertTrue and assertFalse vs assertEqual"