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

Change-Id: I76cd68a5aac198eab012f436ec22ec811744a056