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

Change-Id: Ifcd68df9f73515f9dc3a61ed037ce1d92e388bc2