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

Change-Id: Ifce9205916de6ef70418904771aedd762f23e57c