am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev

* commit '42c70645d28f07db145e02fd4a11af99c6437936':
  Avoid changing internal state of shared drawable