Merge "Ensure if you flash a clean build with the db update that it will not...
Merge "Ensure if you flash a clean build with the db update that it will not try to update you from the old schema" am: 74ced68a am: f39e654c am: f4dff660
Change-Id: Ib3d243f726915b4908fc9ab6125c0bbf46447d42