Fix hierarchical PRS behavior

Change-Id: I61a3cd6e8350d42fd152daf1f4da29ce6809baa2
Closes-Bug: 1404072
Merge "Fix hierarchical PRS behavior"