DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into stage-aosp-master

Bug: 122685541
Change-Id: I2d5d9286f8c7595ac281522a5b06e0408f3630ce