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

Change-Id: Ib3099519c8387e47591037ff9e09f253ca25667f