[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 2f2f638fdf  -s ours am: 0acfc87001  -s ours
am: fc7913888a  -s ours

Change-Id: I8bf9db3fd0da5be1c9e20ececf3f7ef5e1ea6ead