[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: a32f898720  -s ours
am: 16985b8bf2  -s ours

Change-Id: I4988e15e6b919c6d237706dc578631c1cf9cc1fa