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

Bug: 122685541
Change-Id: Ifdbc11f5b99cba69d7b63bd28e6f51db64f3b0ab