am ebb97455: am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev

* commit 'ebb97455327161157432fc0f3effce27990075e5':
  Fix build, only invalidate when creating user.