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

Bug: 132622481
Change-Id: Ic7e8667dc5af3a2e0129e6272a5e56d9adc44128