Update CentralAuth to master

Change-Id: I5693af9fdb12c8ea40fb0031b49744a73e3d98a4