This reverts commit af2673f17d because of build failure in tapas build. Change-Id: Ib02931116181c98b35ce938e42d2376225e9b255
af2673f17d