Continued porting changes to Android.