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

Change-Id: I81464f8d79d2cf4857dd0d24a91127212d0c1fa7