Merge changes  into stage-aosp-master
am: fc32974de5

Change-Id: I2aac3fb3b6fa638e9c0cc871a02216ed498df98d