Merge "Reference profiles use shared GID for user 0." am: 226f77d87a
am: ac437f476f

Change-Id: I937eb89caebc9a750adc4529f4a3620f8840cccf