Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev
am: 102e6631cf

Change-Id: I8ed730d3634ae90559d0b5ca9de49834031af19d