[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 76201443 -s ours am: 56e9006e -s ours am: 860a1fe3 -s ours Change-Id: I9720acde238ea2fba54fc6c532b3914840861e3d