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

* commit 'ba6def68054a2e7f61ed803a797dfe47697be435':