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

Change-Id: Ib478500a29875f6a1bedac00add19c37f979e55d