This reverts commit 315fb5cf. Change-Id: I069b8a0d4e6f2bab6fcceb65026e00698a12bb2a CRs-Fixed: 2403121