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

Change-Id: I1103bf85c61e101d12a7b988a261c5769f4c8fb0