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

Change-Id: Ibafbb934b3fda8382eb2ebca8f1da55e197ada99