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

Change-Id: I9d7a3a28bfd240e634c826fbba647c0ff93ca570