Merge "Remove --legacy flag" am: d3af7434a5 am: c57dd6e8be
am: e9382b76b0

Change-Id: I43580a36f1fb52d9a96e6fc322dbe19221ad52b3