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

Change-Id: I8093fff1e13490be07b62537bbfdfd064102bb46