Merge "Fix permission privilege w.r.t. updated system apps"