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

Change-Id: I8e8c7ff2d296702c8c399eec7f32c7e31e06b5ac