Merge changes from topic "remove-legacy-logger_entry-structs" am: c8ef01344d
am: 8e83d12adf

Change-Id: I9da5b817765c8eeeb87223459f353739035225e1