Merge "new reset carrier signals/actions" am: 5bd39aaf42
am: dc31a45517

Change-Id: I59b456a4e849900080cc0564b096e6dacf7070ae