Merge "Handle exception upgrading to db version 65 gracefully." am: a615f3daa0
am: 09c788dab5

Change-Id: Id8ff0052fc20b80e3ba2749d6d25aea5ea637650