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

Change-Id: I3ba0bdff04d7f86ca369f3a8175c5714a8ffc94f