Merge "Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: db3744969e" into nyc-mr1-dev-plus-aosp
am: 754ac1b4dd

* commit '754ac1b4ddd224fc66f0feaf0c711eb7f7e5b83b':

Change-Id: I76be44aee6148c7e0dd50524df3a4a7ea38f3b24