Merge "Address syntax / error case nits" am: ed6b5177e2
am: 6ac873c3b9

Change-Id: Ia4ff7863f33c0637a0a58dbdac55bf6152a163b9