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

Change-Id: Iff80bb545a1c75256f76541b09cc642796945cf9