Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd
am: a3da659863

Change-Id: Id36b48a4a25aa564b5270ad16aa5a2eb1eadfadb