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

Change-Id: I11f45698fb69481a8b58016abc564a5dcb2dc092