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

Change-Id: I37442bf00664f54412453aec8c812213609f1c56