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

Change-Id: I18b684b25cbb86fe073dfd066ad66656cca6b14c