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

Bug: 122685541
Change-Id: If756f0fc03e57dc6339744b93441575adc5eb347