The Gerrit Settings page crashes if you click on "Change Avatar". It looks like it's still trying to access Google+.

What steps will reproduce the problem?
(1) Go to https://chromium-review.googlesource.com/settings/
(2) Click on "Change Avatar".

What is the expected result?
A working page.

What happens instead?
404. That’s an error.

The requested URL was not found on this server. That’s all we know.

Additional details (only visible to internal users!):

com.google.apps.framework.data.DataErrorException: <eye3 title='DataFetch #148241794: NOT_FOUND'/> generic::NOT_FOUND: com.google.apps.framework.request.NotFoundException: Requested profile is not a G+ profile.
	at com.google.apps.framework.data.RoutingDataFetcher$DataStream$1.onSuccess(RoutingDataFetcher.java:260)
	at com.google.apps.framework.data.RoutingDataFetcher$DataStream$1.onSuccess(RoutingDataFetcher.java:227)
	at com.google.common.util.concurrent.Futures$CallbackListener.run(Futures.java:1245)
	at com.google.net.rpc3.util.RpcFutureStreamImpl$AbortOnListenerThrowableExecutor$1.run(RpcFutureStreamImpl.java:628)
	at com.google.tracing.TraceContext$TraceContextRunn

...