Merge "Revert "Revert "Proper refresh when Authentication finishes with Activity.RESULT_OK.""" into oc-dev
am: 04bf31f47f

Change-Id: I458b1fc645068849bfb053f73c2d9336f2051685