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

Change-Id: Iada8bae2c577d371b9e314eaa5237f2708d955db