Merge "Additional LMK diagnostic information"