Merge "update required permissions." into gingerbread