Merge "Prepare for removal of legacy-test from default targets" am: 1b0267d126 am: 0d02d1fa1e
am: e54dc68df6

Change-Id: I067a05e05f30bf6325833cc2c83357df84d3117a