Fix DensityChanger rebooting into recovery

Change-Id: Ifc84c0e0310eedee5f38e70a8e977f4666c7faa7
cleanup unused variable

Change-Id: I532d2023d7f4eecd00e4572b3cb02be237c767d1