Merge "Fix issue #3291975: Google services frame work crash..."