Merge "Carrier confirmation code." am: 6627d2c4df am: 0e788e00b6
am: 486385092b  -s ours

Change-Id: I34d9496ee29684f5a1ceb6c9ab01ad87ffe72e8d