Merge "Clear identity when requesting current user." into jb-mr1-dev