Merge changes from topic 'hal_firmware_reload' am: 0b739705d4
am: af2f057ace

Change-Id: I7370f6f2b98c3087c2bd4b4ad3e56f8dbecc40c9