This reverts commit bcb21be7. Reason for revert: <Unnecessary fix> CRs-Fixed: 2498731 Change-Id: I03e7e7a1397e4da87a6782d480b9f52a9afe4c1a