Merge "Prepare for removal of legacy-test from default targets" am: 524cce0089
am: f40b38da25

Change-Id: I2f3eee0caeb944a5b7962ab86e74ad2bb009caa9