Merge "Use correct UID checks and proper database lookup" into nyc-mr1-dev
am: d9bc0f474c
Change-Id: I5676ed77409da3393762ab642841078caebef0fc
This commit is contained in:
am: d9bc0f474c
Change-Id: I5676ed77409da3393762ab642841078caebef0fc