[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 20c336953f  -s ours
am: 1fdfa469a6  -s ours

Change-Id: I4224085df6dd07c11fcc0caa42ae1e2e40d8a05e