Merge "Fix moving of apps into legacy ASEC." into mnc-dev