am 593f2040: am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit '593f2040a0c393a3ae68ffbc63be07a8db21d1f8':
  logd: build breakage in git_master-nova @ 1151709