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

Change-Id: Iff0385a2926c09552bea908dba05295957ac5054