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

* commit '25b094b0473bb52238d7d45d4ba69b0d9949121c':
  Only allow primary users to block numbers