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

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