am 2a8bb978: am 51eec3b9: Merge "Fix relabeling of secondary user package directories."

* commit '2a8bb978d506162a2cff801f24659207790cffd3':
  Fix relabeling of secondary user package directories.