Merge "Fix improper use of CloseGuard." into jb-mr1-dev