Uninitialized variables causing trouble on Android.
Merge commit '302f5c5'