Merge "Modifying error/return conditions during fusion sensor initialization" into...