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