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

Change-Id: I6da01817370fa1244499644497396a57e55df492