Merge "Fix unprotected variable access by serializing." into jb-mr1-dev