Merge "Recreate usage tables on error am: 4228e2327e am: 61f0de0e7d" into oc-dr1-dev-plus-aosp
am: f0aeeb6b45
Change-Id: Ic494c55e0b7d425382ea94b110c9109c665ccd1c
This commit is contained in: