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

Change-Id: Ifffc2ffc8562e55680bc43a46f1bf512dc16b12e