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

Change-Id: I74ae85f0c3d3826bfc7dabee43d8e537948444fc