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

Change-Id: I9838a260c2b07ff14d1e57ebb85ac5e4e6f1d81f