Merge changes from topic "am-807850e6181c4a3bbdb34ab53eee15ad" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am: d6684f4b -s ours am: 07bf8f73 -s ours am: 74e8962f -s ours am: fe8e4d21 -s ours am: 2bd7c89d -s ours am: e3bd18ca -s ours
  [automerger skipped] Allow sensors list to be empty am: d9e0d0ad -s ours am: 9894e176 -s ours am: 1e324d2f -s ours am: 255ffb04 -s ours am: 28317b31 -s ours am: 9f7a0e25 -s ours