This reverts commit 7a059d42. Change-Id: I3b5c615012bacc440362e23e343ab05db8d3253f CRs-Fixed: 2616500