Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de am: 29a72d0e22
am: ba57775354

Change-Id: If81ba7729c288b94a6fdaf7de9debba76b248ca6