Merge "Use correct call to get Android user ID" am: 91fc4caa02
am: 549c87882d

Change-Id: I9ebebdfee5cd5a9967aa19357cabd04c10af78fe