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

Change-Id: I8ab4bd809f3944360d5b1d8ad38b663b757f4ab0