Merge changes I359a952c,Idcafae15

* changes:
  Fix a bug that would cause the AutoFill server to return an error.
  Add more profile data to the canned profile.