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

Change-Id: Id32488dfe7498c7b00ba05c2fa88de6465b362ee