Merge changes from topic 'sensor-cts-8r2' into oc-dev am: fa6b5ba609 am: debdfc5641
am: d085f8ef89

Change-Id: I02c064f0bacb72618836af4aea7eefc43390feb1