Add bounds check to sensors direct channel creation am: 0eb4624b33
am: 9f58afcc4a

Change-Id: I4c8dab81b0bdea6ac6c80dc55fc4dab3e645c355