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
Change-Id: Ideafb060b0f99318766249d8512400cdac0d225b