Making a PR for Luke's android fix branch