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

Bug: 132622481
Change-Id: Ie44a4ff10f2a60e214c851552fc0ffc57aea8fc6