Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Reformat with GJF
  Remove reference to AccountPersonalInformation

Change-Id: I1e278dfb105173ed6bad80eb8a76509324ed9f56