Merge "fixed typos in log fixed bug 34845702 Test: manual"