Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am: 372b6b2c am: 3fbcd8cf am: dec65547 Change-Id: Icd19f7ae6a7628df97ee7e8e57d63ca51ad581cc