[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 6542abecbc  -s ours
am: 94962e9387  -s ours

Change-Id: Idd1a206fe6cbabb0896abea057f2e3c267f8ed89