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

Change-Id: I118018f882f42f7b17ae730d2faca1ff1933a7ec