Merge changes from topic "am-471d06a1ce5d4ffc951301aeabee7123" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-qpr-dev am: b0137a40 -s ours am: dfbf9653 -s ours am: c8d72fc6 -s ours am: 68ea2083 -s ours am: 5901e852 -s ours am: 73f7a624 -s ours am: b4c6696a -s ours am: 4f5f11a4 -s ours am: 4071d050 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Make log reader thread a class member am: 5a0f6c5b -s ours am: 58fa6488 -s ours am: 16541dfc -s ours am: 89214c39 -s ours am: 74949cdc -s ours am: 3a541f17 -s ours am: 4be332a4 -s ours am: 9626ea4f -s ours am: 0514e839 -s ours