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