Merge "Split loading process for battery header" into oc-dev
am: 987ee5338a

Change-Id: I395b493338f0225bd300e155d3303a1ba9136555