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

Change-Id: I0bd380bf33364246344465a52c6f899ce0086207