Merge "Check for upper bounds of nselectors."
am: d8e8ba4d7b

Change-Id: Ie5b372f0617f3a9a7deba3ba36c86df295db3ff6