Merge "Logd: Fix wrong parameters" am: 913ad12543
am: 0daaa5aec8

Change-Id: I3bc438c69f6f3b10d86d42625b655636a7605ced