Merge "Change APIs related to carrier actions." am: b430d57705 am: 0ef137bb81 am: f0225870a7

Change-Id: I8d081091ce7cae36698bb6b6029302a822381ffa