[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001, history only) into master am: 92fadebac5  -s ours
am: e47b3ec560  -s ours

Change-Id: I02990da360eff904dd0b61479ddcbc9bbaaa70fe