Merge change 9010

* changes:
  include GoogleContactsSyncAdapter in products with google