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

Change-Id: I7710a0b1a5ba1bf7acd45d694818aec91853e546