am e877069b: am ba6def68: (-s ours) am 0c61a650: am 2e132ef6: Merge "Logd: Handle unused variable and fields"

* commit 'e877069b576e652d21fdb946452c20742db17980':