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

Change-Id: If3645624e70fca2af849cd0d50491de45526ea73