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

Change-Id: I503cd2c7d7ca63d9668995319d4876a39fc91666