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

* commit '324df4d5bfcc4c8988dc1d3331c22927cb362b39':
  Fix NPE in decodedBitmapDrawable