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