merged android changes to glass