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

Bug: 122685541
Change-Id: I42d133a6a2714917a37d030ff894d5936f5c75bc