am 13fd04aa: am 3ac982d9: Merge "Use the view size and scale type to restrict NIV requests."

* commit '13fd04aa8d32d873465badf4a96aa3a970037ff5':
  Use the view size and scale type to restrict NIV requests.