am 083928fe: Merge change 5718 into donut

Merge commit '083928fefde7060eb69f7f45cd8e2180efa9bfe1'

* commit '083928fefde7060eb69f7f45cd8e2180efa9bfe1':
  Fix NullPointerException in DrawableContainer.mutate()