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

Change-Id: I924dde903862a7f5caf4e87f31e99870222a9c1c