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

Bug: 120502534
Change-Id: I3db24e4b2aeb150a26aa364b66fde73774b5c247