Merge "installd: Account for empty  obb contents on migration" into qt-dev