[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: a063e91433  -s ours
am: 76b30a64dc  -s ours

Change-Id: Ic325960d7e6818520e53b67eb0d9a75cb8112e41