6aa717e4a1
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp * commit '97e58ef444da53165caab2a7be4fe44c154d5a0e': DO NOT MERGE Separate utility methods into utility class.