Merge changes from topic "am-04d816e94b23473b80bda9238351c36b" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am: d6684f4b -s ours am: 98d84b83 -s ours am: 3450296e -s ours am: 87821130 -s ours am: 6835ea58 -s ours
  [automerger skipped] Allow sensors list to be empty am: d9e0d0ad -s ours am: ac1a5ac9 -s ours am: be772990 -s ours am: 74636a6a -s ours am: ae93ff05 -s ours