Merge "Merge "Fix the misuse of calling user id as group id" into nyc-dev am:...
Merge "Merge "Fix the misuse of calling user id as group id" into nyc-dev am: 66e640d8 am: ba58fdee" into nyc-mr1-dev-plus-aosp
am: 0da4ca25
* commit '0da4ca25':
Change-Id: I0ff8e9e0c6260e8fb1062242d1b0c1a11dddd177