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

Change-Id: I298d8ea8e843c5b7f0af7654fda2fbdcdebb16ab