am 3ac85d31: am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class.

Merge commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe' into gingerbread-plus-aosp

* commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe':
  DO NOT MERGE Separate utility methods into utility class.