Merge "Print carrier Id information in toString()" am: 843e387bb6
am: 55b4b268f5

Change-Id: I2a9fa3332c842bda8856006c7963814838ae8544