[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b634e9191  -s ours
am: 904d4df89a  -s ours

Change-Id: If860aa9619b4655886dfdac1528940e5e30446fe