Merge "Move IccUtils to reflect Java package declaration."