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

Change-Id: Ic9ee10bf335f7485ed3fd11040ef055789e429ae