Merge "Prepare for removal of legacy-test from default targets" am: 6946d8aae5 am: e7cfbd5cf6 am: 5575c333d3
am: 5c504aac78

Change-Id: I77bdb8afde619f9966972e802e479e02e0ebae50