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

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