Merge Android fixes into 'master'