Merge "Fix legacy OBB data migration path"
am: cbf6a2ec1f

Change-Id: I77ef0d90dd3677d7833801e5f2d9eb3f50c3c55c