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

Change-Id: If822347ebfa0a0647444a320b2ebc772c892a42e