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

Change-Id: Ib3458dfd6bf5bfd646cb24c607ec436f897531df