Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev