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

Change-Id: Id44156e826d8c1560c6974991183dd57caf376ed