Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
am: a78c2e65e1

* commit 'a78c2e65e13cace4fdbb0295beca5b11de9fde06':
  Avoiding flush on-change sensors at subscription