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

Bug: 122685541
Change-Id: Ib9343632d4b0a56b81462ef5b4ad79e1a9d309d2