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

Bug: 132622481
Change-Id: I4a2b2c1e0e8bf6338999f09f7f906abbf74cc0c8