Fixes SWDEV-256563 - Mainline build breaking issue. This reverts commit eac709a8a9. Reason for revert: <INSERT REASONING HERE> Change-Id: Ib2e9ef362dc7dece9f4bbe7611b4be45087aa18e
eac709a8a9