Merge changes from topic "am-78f401ebe7974e41af578105c020102a" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-dev am: 7aec1d83 am: 4a0dc5a1 -s ours am: 508bbf10 -s ours am: 547b64e1 -s ours am: 67401687 -s ours am: 367219bb -s ours am: 3ae0a05f -s ours am: aeea04cd -s ours am: 47ab5ec1 -s ours am: 87d85949 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Make log reader thread a class member am: 03de4e4f am: 3cc45016 -s ours am: 9bee032a -s ours am: e7bd1c64 -s ours am: ed8fc43b -s ours am: 10961a4a -s ours am: ac88db6e -s ours am: 7ed23172 -s ours am: d5d8e36d -s ours am: 5b8f9d09 -s ours