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

Change-Id: I29fd94236e908e6dd4d9812c351518f2ad70f948