This does //not// fix all calls in core. Bug: T244929 Change-Id: I02ffcca31fa0bdc6bffddf21e82f4ff5e9ab5374
suggestChangeOnLogin