Fix syntax errors created by rebase

Change-Id: I184d3890fac467391ed804c38e1966cb8b7efa4d