Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691
am: 923046251b

Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6