[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: c0df4815 -s ours am: e2678d3a -s ours Change-Id: Id1ffa2abc29d38f222d2a1fb055aa8487d42a9e3