[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 7328c9ff -s ours am: c406e71f -s ours am: 5c03dbf6 -s ours Change-Id: I26b735068a50388edf792982413edd8961b84797