Merge "Support fastboot variable battery-soc-ok" am: e06850afdb
am: b003fa556c

Change-Id: I10d851b3512dfa178eb6b29e0addd07e7b8367a9