This reverts commit 3a7c2ddda918ea0ba239c51d74984a499c392942. This change has been included in new base .so revert it Change-Id: I50210a029c2f69b8561a7cae2f4b87b190b8a842 Reviewed-on: https://gerrit.mot.com/1791620 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: gaoyx9 <gaoyx9@motorola.com>