Merge "disable carrier actions on redirection part 2" into oc-mr1-dev am: b6a1c5f06b
am: 4de11ebc0f

Change-Id: I035beeaf3c14f3ed42f15a2ae0036b065b9149f8