Merge "Fix requestRestore() of an app's own package" into mnc-dev