Merge "[pm] better annotation for storage flags"