Android CTS 4.4 Release 1.0
am 7acf30e9: Make sure account upgrade code always runs before reconciling

* commit '7acf30e9ab077362dc03812583044fb3e23206c3':
  Make sure account upgrade code always runs before reconciling