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

Change-Id: If1cc5c0f49267b55639403bcbae5b2697bb00df5