This reverts commit 2addd175cc. Change-Id: I1b4a145bc1b491d65f49dfc0f5990e52de8a4f37 CRs-Fixed: 589261
2addd175cc