Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am: 997042ac33
am: c244963675

Change-Id: I30e0155a9260ec4099ad45d7161c8459c8b657a2