Merge "Allow selecting IMEI/MEID text" am: 5800262b1d
am: d64844f414

Change-Id: I4c3b02949f6112a93982ecd11e3323afcfc03f72