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

Change-Id: Ib6d8fd8a3e1645d765837c40f900b5211265f63d