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

Change-Id: I8a832840df2a9e222dc74126f28fb96f3a659120