This reverts commit 4c16eb50. Reason for revert: breaks carrier testing Fixes: 133402064 Change-Id: I554a4a7fd9e7b327343c618b2ca8c4fd0d3353a5