Merge \"Optimized onUnlockUser\" into nyc-mr1-dev
am: 5a1f346e2d

Change-Id: I8ca8586d348ab26806bf77f7c160391301e2f8c5