Updating CentralAuth to master

Change-Id: If675b2a555ba4dbbc16a5b34a2d5bafaadd127e3