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

Change-Id: I6ffcb5a6cb52bf2e756d731c353a10c0c4591e74