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

* commit 'fa173e0c65219e56625c22b0ac482354d924bcd8':
  Update drawable container constant state following clone