Merge "Show PLMN on CryptKeeper" into nyc-mr1-dev am: c3fddb984c am: c33c91ffd9
am: 3c228087d7

Change-Id: I80a7a2c7d58b1704580a8f6a6a5d11413eb6775f