Updating CentralAuth to master

Change-Id: I292eed74a84c7fc967d96ef2f3248f163a57016f