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

Change-Id: I8148abd3bf2edbdae1d60469736e5da90505847c