Merge "Add Shelve/Unshelve policy tests"