This reverts commit 142fb94b. Change-Id: Ie5e95643913a669b2352f5e83de2814a29813e37 CRs-Fixed: 2431245