Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev am: d3d1c558eb
am: 69f082fceb

Change-Id: Idc4175302e5fefb8656aea0dade652605420aa6e