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

Bug: 122685541
Change-Id: Ia60600e6d92af190f942128d76c93d041e495e59