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

Change-Id: Ide998fc70c7beb72b1bcf878783a5429268d1aeb