Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev