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

Change-Id: I9cec7254a8a7d15e32dee1708e70739b04aa7c4f