am c0b74902: Merge change 24171 into eclair

Merge commit 'c0b74902b85c538c9dac549aa5b213a3fb3edc57' into eclair-plus-aosp

* commit 'c0b74902b85c538c9dac549aa5b213a3fb3edc57':
  Turn an assert into an error to handle bad struct members more gracefully.