Merge "Update local cache before sending intent." into gingerbread