This reverts commit bbef6270. Reason for revert: Causing long sms failure Bug: 68762942 Change-Id: I43c36e3286105459c7e08d1a0b2d89b4c42140b2