Merge changes from topic 'boot-control-hal'
am: f50aa9464f

Change-Id: I0f139fe08524d54328f2a3540f6683d65288743f