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

Change-Id: I86897e8988a8669c0b80295d4d0b577a1301c03f