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

Change-Id: I18decd9ae11eb15b610c669ba30b86e28fdda16a