[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 15b123ef45  -s ours

Change-Id: I60ae19c5ff7d5de669fac1ebd93d48283d9f27d8