Merge "Change density for the correct user" into nyc-mr1-dev am: c779cdc560 am: 720855d865
am: af48b214ad

Change-Id: Ie59c1f6ed0ce20c00d9b25ef1095024b2478e085