Merge changes from topic 'ble-scan-accounting'
am: 725d2dac7b  -s ours

Change-Id: Ic992092816435f0b1b24c762abd06722e32b7c58