Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev
am: 52a11f7c64

Change-Id: I39b8c6a55804b088705889888d006695ef54231d