Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev
am: 839ff816a5

* commit '839ff816a516a6eb806aee2cef681ad3b3c14b56':
  DO NOT MERGE: Add separate information about user whitelist.