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