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

Change-Id: Ib6c1c6b834aa1cea258d03eeb5e4236c88e6bf17