NPE in oauth2-client-google-webapp fixed.

Change-Id: I1b0816f04958d8e1e6a1f1c35bc300dd0f956b1b
Merge "NPE in oauth2-client-google-webapp fixed."