Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" am: 041eb388de am: d63c1209ed
am: cf825b33a0

Change-Id: I9d7ade22e528dac625debb580b0ebc54022b83a1