Merge changes from topic 'hal_firmware_reload'
am: 0b739705d4

Change-Id: I0c8327f5649e96f5005856c18e416f8896c3ec9d