Merge changes from topic "uid_war"
am: 0a0cfbd2be

Change-Id: I2fae8034df5cb974edd8ff7a3c7b6a3448291f8f