Merge "Fix leak on density change." into nyc-dev
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I8c474e29100543668a2348baca5f34b868cf8893