am 6e1c6b19: am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev

* commit '6e1c6b19fd92889293fa0af8f48d5d0589a0911e':
  Avoid NPE when drawable fails to load