am a7055b01: am 5006eb75: Merge "Null not handled when parsing media size resource id attribute." into klp-dev

* commit 'a7055b01ec6d9931e4eb06b8a9fd76e5a9e165da':
  Null not handled when parsing media size resource id attribute.