Merge "Fall out of sensor direct report API update" into oc-dev am: f5d41e6f46
am: 5220bf8497

Change-Id: I8ec1dc3811f27cc7326a8dfe9035d99197a19c3a