Merge "Move legacy obb data migration to a handler thread." into qt-dev
am: 6d371e092e

Change-Id: I3d2ac607aa678ea7947b27d3b86a6bff9300100d