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

Change-Id: I3a9bc1cbc03e4af362cf9e1c399d9028daf660ee