This reverts commit 5eb33357. CRs-Fixed: 2576723 Change-Id: I4d9912b5ee76224d807d297034c572a4bb752844