Resolve grammar ambiguities which resulted in ANTLR errors and warnings

Change-Id: I5a942ced046b461cab52272d88f2c66f4f031026
1 file changed