(CR) revert to fix build error This reverts commit 9569249223bac69cac391e7dca8f0f55753c8ef5. Change-Id: I65f9df3f8e7e04e2d404e5107ddc0baedbfe08c1 Reviewed-on: https://gerrit.mot.com/2142565 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com> Submit-Approved: Jira Key