Small changes to android draft.