Merge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7 am: 5b1a460b94
am: 72624e0720  -s ours

Change-Id: I2ae8a19d0a0bc4deafbecfeadbc12803d1b2ff54