Merge "Fix legacy OBB data migration path" am: cbf6a2ec1f am: 007dfd17e9
am: a08c0c7850

Change-Id: I06605324f57a916fc909f2be67fd0c2064967a64