Merge "new doesn't fail on Android"