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

Change-Id: Iff1960bfe0d69b2afd3df4fd0f7d7d6a5bffa78e