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

Change-Id: I36e81178a63429020456096ac3dd3911d07a7172