[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0016efbc44  -s ours
am: 92e9696929  -s ours

Change-Id: I3f2318412bc9efd76c17138164bc9e605932361f