Merge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7
am: 5b1a460b94

Change-Id: I52289854a38a36929cd9b8d20e85b00346b3317c