Re-instate the original commit back into mainline to validate.
This reverts commit e5433a437a06221b577d0b54c4e4936d317e4c1e.
Change-Id: Ida06a55eee333d31fb0f0f212daed74c11c790b9
Reviewed-on: https://gerrit.mot.com/2118107
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Bernie Moreno <berniem@motorola.com>
Reviewed-by: Ling Jin <lingjin@motorola.com>
Submit-Approved: Jira Key