Merge "Fix caller validation on secondary user." into nyc-dev
am: d51b363c0d

* commit 'd51b363c0dff6bad46093db474ae314db33d0157':
  Fix caller validation on secondary user.