Merge "Only allow primary users to block numbers" into nyc-dev
am: c98a563

* commit 'c98a56336fd49a8c5ea2834a141627d3cf0d8d6d':
  Only allow primary users to block numbers