Merge "Re-add missing log filter" am: 9e89b22ae7 am: dc640ca34a am: 0cb9d7a4c7
am: 6ab87f8fe4

Change-Id: Iaddcb34e6812f9c478d4142d105c45f7b4802249