Merge "Remove WITH_SYNTAX_CHECK" am: c114bd9dbf
am: d640e062e8

Change-Id: Ia808c46ce1089210eaa5db02b446cfca0ed5cdde