This reverts commit 16b819d1. Change-Id: Ia89cefdba4572447fe1e4bc2d569ccf0e220e943 CRs-Fixed: 2452919