Merge "Support fastboot variable battery-soc-ok"