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

Change-Id: I5fa9f57671569f085a4a4faa486a0befb3219810