Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5
am: 42f777bbb6 -s ours
Change-Id: I4af92835d0d5dd7b86d38406636caa723a69f277
This commit is contained in: