Merge "Work on issue #36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev