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

Change-Id: I76d804138399aef9da2b201ad0757cc1e1ded44a