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

Change-Id: I576a360159eecd153385c24b6bcaca7f7cea633b