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

Change-Id: I7e50bf93fdd5efeb81ac2081b1fcd54cbf986d32