Merge "App changes for handling profile DB split."