Merge "Move both app code and data together." into mnc-dev