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

Change-Id: Idcdfb7667b0db7b403bab38bcc24201a8eafe4ca