Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15b am:...
Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15b am: 52e1425a" into nyc-mr1-dev-plus-aosp
am: 5b99c714
* commit '5b99c714':
Change-Id: I9dd2b9c9a94818df541e9d2ea70c07647af1a234