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

Change-Id: Ie6809bd88ad77c622152fb9a48c54178ee1868ee