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

Change-Id: Ice00bc9914dd56ee0dc790d9b8f246966c63eca1