support data migration from OEM legacy app to mainline am: 32f525c975 am: 383e36c9aa

Change-Id: I9b1dc1e313b1035af00c0b066bbc06274569caf4