am ba8a76b0: Merge "Fix NPE in decodedBitmapDrawable" into lmp-mr1-dev

* commit 'ba8a76b0f9aa3caf21c5915276d00f36e1321b43':
  Fix NPE in decodedBitmapDrawable