Remove goo login and fix FC

Change-Id: I3e23841aa24e7109194509978a2767cee1079ee6