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

Change-Id: I0b4bd3128c8dafbec78b739ba51921d03e50d0a1