am 4113243f: am 324df4d5: am ba8a76b0: Merge "Fix NPE in decodedBitmapDrawable" into lmp-mr1-dev

* commit '4113243f115138cc4d9e4f487b29e133c91058f7':
  Fix NPE in decodedBitmapDrawable