Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691 am: 923046251b
am: 038bea5dd1  -s ours

Change-Id: If8647a5437784018aeb8d1704899496cec542dab