[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: a41f813eac  -s ours am: 9d99b75dcd  -s ours
am: 58a26adcac  -s ours

Change-Id: I6d8bfe2501f7bc200f99163ba65b3a04e8a2719c