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

Change-Id: I85346033254c15e9f2529e3923875c95dbbb7a24