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

Change-Id: I1d6b0419f1b07ffd0a0b2100daf699554fbd15d4