DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master

Bug: 132622481
Change-Id: If4fab686cabd82ff2307ae82b48c4475e64da4b3