Merge "Compare against correct user id to determine static lib clients" into oc-dev
am: 13eef357d6

Change-Id: I94d6ec64d861a687d4bda6ef900d092c3401bc03