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

Change-Id: I4a334fd3c282262c21851d263d4df94e02b38142