[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: c44dfdf5b2  -s ours
am: c01a882b1f  -s ours

Change-Id: Ic75f5388f3bd8b0ed93a9eb9923c2772910f87ab