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

Change-Id: I7f0fe81bf80bea37d368a7016f244bb73fae4cf4