This reverts commit 81a8e5b4ce. Reason for revert: <Qorvo Version P2-S4(ag/15139489) which caused these errors got reverted from sc-dev in ag/15224151. It will now go into master> Bug: 192924316 Change-Id: I772053cf512ba555a5fa657d39f957ac51f013c1
81a8e5b4ce