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

Change-Id: I832470431fcc804f4a2d6bf0ec8433ba1f59b621