Merge "Change confirm Import/export cancel dialog string" am: 344beb3020 am: beba5ed599
am: 0a6398efb5

Change-Id: Iecb9d8b285edf9bab2b048384fbef620b0f7640f