Merge "RE-APPLY: Use custom metadata object for all logging"
am: 84699b257f

Change-Id: I7435bca526640663af817c89dbf1d73d6b890e76