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

Change-Id: I8e171e6f7e534f0b69993357223ee2f62af46c32