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

Change-Id: I33f9c04e9acb96d68c80604ab946e12fe8fd4746