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

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

Change-Id: I72fe069a95c9105d2005cfb272b9bfd39f472f26