[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 419086d8b3  -s ours
am: 7768155274  -s ours

Change-Id: I91475b01f6a1fa9f64f384ee6351e237c3e79c85