Merge "logd: build breakage in git_master-nova @ 1151709"