Merge "Don\'t opt-out of warning dialog by default on user builds." into nyc-dev am: 34510eb
am: a6db844

* commit 'a6db844cef552bcdd4df5dc44b61b59608d8f08a':
  Don't opt-out of warning dialog by default on user builds.

Change-Id: I49510d696119cd1759b567951bf58c285255363d