Merge "Add support to read fastboot variable 'off-mode-charge'" am: e15267b5d1
am: e83c49def4

Change-Id: Ic1b461e95881b94c74b71784cf8caf74c2ab2805