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

Change-Id: I24451c771e718285be394067b5b0b9d80244fbdc