[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 1834345200  -s ours am: e6e38a7a71  -s ours
am: 8896957efc  -s ours

Change-Id: Ifd17e0246e11574a379cdbbc13e9d09365d1e93d