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

Change-Id: I71bc8d4951bfdbbac6647f875827b7e1c217106e