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

Bug: 120502534
Change-Id: I4bf41afc0241d7d36fa811d4c6294b3c7f48c0d0