[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 7ebbf2cfc2  -s ours
am: 551999e4d2  -s ours

Change-Id: Ib459b5abd13e81f59684069cac3c43f62b88552b