This reverts commit Ibabfac61097e28620da44fb311802d81cc765aff. Change-Id: Ic2161da13baef54ec74e7d3cf234a9fc7d447e19 CRs-Fixed: 3075704