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

Change-Id: Ie05dd78507129df8347c6f66357d20600372a8c5