Update CentralAuth to master

Change-Id: I9f419c288fdae6a6f190084c9be05929f87bd966