Merge "support data migration from OEM legacy app to mainline"