Merge "Carrier confirmation code." am: 6627d2c4df
am: 0e788e00b6

Change-Id: Ibbb439b724ee031b76ff42ecd84c3c1f2df69ae1