Merge "Syntax fix" am: 86f4b77c9f am: e4054482b0
am: ebfaeaab3e

Change-Id: Ic4293d215a3913d93f6e439375a3bb31ffb17f6e