Merge "EDI collection update for sensor direct report" into oc-dev
am: 505dc8d8ab

Change-Id: Iaeff75bdae589f9e9c5999f0924026703dfbb466