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

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

Change-Id: I10bc5f966913b39c81ffffa73739bbe24055a54d