Merge changes from topic "am-3fc7639a008e458ca30ed79ae3682514" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am: d6684f4bfb -s ours am: 07bf8f73bd -s ours am: 74e8962f1c -s ours
  [automerger skipped] Allow sensors list to be empty am: d9e0d0ad7c -s ours am: 9894e1768f -s ours am: 1e324d2fc0 -s ours