Merge "Re-add missing log filter" am: 9e89b22ae7
am: dc640ca34a

Change-Id: I4eefddf305ccd7e71d94863c231316b80c4bf68f