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

Change-Id: Ic0477724d2b553002b10f7529f1014910b3e6215