[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 6d1c7d843d  -s ours
am: 7caa8a9446  -s ours

Change-Id: I70b64a54cedb6225d606504f1a4de5dd46991a28