Merge branch 'stable-3.0'

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

Change-Id: Ife3fb3a95341ad7754dad4cf2cf5d756b1ed4740