Merge \"Merge \\\"Polish around locked user communication.\\\" into nyc-mr1-dev am: 9882960460 am: f624e7aefb\" into nyc-mr1-dev-plus-aosp
am: 7fef265268

Change-Id: I3a3246bbc2dde958a8e8ddbcc713612236aeedb0