Merge "ScanRecord.getServiceData NPE fix"