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

Bug: 122685541
Change-Id: Iaf7c93d25f4738bfdd6d20393fd166ee2b162fbd