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

Change-Id: I559890874c83627283a891f7eb6c4fd46430f618