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

Merge commit '78495f8ccfb63594cdc8fbba76372d5361c028e1'

* commit '78495f8ccfb63594cdc8fbba76372d5361c028e1':
  DO NOT MERGE Separate utility methods into utility class.