Remove more noise.

* While a solution is being pursued at the network side, this will help remove some noise.

Change-Id: Ib6ac793b228e75d3c1451006acfbffdcede40094