am 33ec793e: am 0ca02512: am b1825fea: Merge "Throw IAE on invalid measure spec size" into mnc-dev

* commit '33ec793e6aceadb5f5a5f507b84b9c8568dbc2a4':
  Throw IAE on invalid measure spec size