Update OAuth to master

Change-Id: I34c61acc027cd74162cab4794f61ca92955a2968