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

Change-Id: I0593f5b7bb347cd4ee8dfe6fc21b2eadc1e91ff1