Merge "Prepare for removal of legacy-test from default targets" am: 382bc45b8f am: 90b8532341 am: 01a7c93fd0
am: 5dffc10ad0

Change-Id: I2d7cea8d3247d2c8850ebf6518293fa1a5eb424d