DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk am: d89d29d  -s ours
am: f42496c  -s ours

* commit 'f42496c55225aaf2aa28a059bc38aef3badd3705':
  DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk

Change-Id: I18d5a628fc494995eb29c72af42951fbb81cefad