Merge "Make getAssetInt throw unconditionally."