[Thread] resolve open comments for aosp/2737373

Change-Id: Id2c58d8bf72139f10036b5488a12f45dd0c7c2db
3 files changed