Merge "Fix relabeling of secondary user package directories."