Merge "Remove WITH_SYNTAX_CHECK" am: c114bd9dbf am: d640e062e8
am: 28d50c498b

Change-Id: I335a3b87e3e7e75be9b2a2c2031388609d69c057