Merge pi-dev as of ag/4582919 into stage-aosp-master.
am: 433be7e253

Change-Id: I14d55fd12e82781702d6e1c007a535420f619773