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

Change-Id: I4505e845d2d85a5b8fd9f4c13c29f1ba5adcc690