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

Bug: 132622481
Change-Id: I0866e99788b7f31d92272fa8edee42e00e9352d4