Merge "Show error dialog only when 'ask first' is not set"
am: b092b90d8b

Change-Id: I18baabafcbfb59de4ff09e8d072cba5181bddeab