Merge "CTS: Fix line filtering" am: 11db93c6fb
am: 1a4d06a950

Change-Id: I97e275814c3c4889546c616a2e1a24fe795ac533