Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" into pi-dev
am: 3667b71225

Change-Id: Id85c50ba8f5599f0f7c77dd0189707604ba53584