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

Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841