This is needed for Account Settings UI. Bug: 13656853 Change-Id: I33129e4b7b33b428a7bf670259accacb60f62d9b