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

Change-Id: Ieaeb8ae7cb765f493492d267e9f73bbe3b7d3b57