Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev am: fc73208ec9
am: 2f5f9b6a39

Change-Id: I2f2a33d45c7bd7c6ba3828baefeb051a51cca754