Merge "Fixing syntax and behavior from previous commit" am: ce7a8b4be5
am: c5a8e8e9cd

Change-Id: Ib36cce677e1439a09deb06e72155192808147ae2