Merge "Remove --legacy flag"
am: d3af7434a5

Change-Id: I79b2e735932374cc4978754a7615486e1a8c5a00