Merge "Handle ISE when physical volume isn't mounted." into jb-mr1-dev