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

Change-Id: Icf77675866d843c8d6d5cc30ea1a5f1d8f0cfba7