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

Change-Id: I23c5dc4de02b8f8544e265f139513075ba1af9f4