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

Change-Id: Id2e4beb6943517f81a7125d7406bc7a06a1a60eb