Merge "new reset carrier signals/actions" into oc-dev am: b71f3ca3f0
am: 7ba4474071

Change-Id: I0af3f64384b75d0ccffe670e8fbd1a166d3ee12e