Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935 am: 043c5d763b am: 9b345b5991
am: 44c1afdc7f

Change-Id: Id3528148be3678f3fc9eac56943607742e377076