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

Bug: 132622481
Change-Id: I496086cf2ff58ed8d47c7c9391b010d687541cc7