Merge "Use UiContext with StrictMode Dialog" into oc-dev
am: 9274d87a0e

Change-Id: I1b62c2f6aeb7d7167a6bbf1e4b09124914c7936e