'Merge' changes from 'android' branch.