Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread