am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev

* commit '42b678b3d7c10d6986aea82ec72e1b36f243972a':
  Update drawable container constant state following clone