Merge "urushi:typo fix" into gingerbread