Test android-19 fix