CRs-fixed: (CR) This reverts commit f365d6f2a3d5c2bbfe960c3fbaa06f9474217422. Change-Id: Iaa0be2cc5a738483a61766bcfdee6cbccee0b28d Reviewed-on: https://gerrit.mot.com/1678633 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jianqi Yang <yangj@motorola.com> Submit-Approved: Jira Key