Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
am: 8d0eb01843

Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4