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

Bug: 132622481
Change-Id: I7306cc2e23bdb361dd2c2ecd93064538a85296e1