Updates for off-mode charging

Change-Id: I34cbd1b7fa898328f0b23dc4a5b513a92c579304