Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev