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

Bug: 132622481
Change-Id: If165a5fe6a83e570a4abcf707eae62e6a940d5f6