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

Change-Id: Iad9ff4c1455d9c2661ae6e4b0437c919c6b742eb