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

Change-Id: Ib541922768fc10d16693c20a44f68172e8f82efe