Update CentralAuth to master

Change-Id: I18e9c5a9446f39d7eb2583be3238d640b7af166d