Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev
am: fac2141f4e

Change-Id: Ib89a4888b3776dd6eb2ff3754c027b2ec54e4c56