This reverts commit a35c6e4f. Reason for revert: <INSERT REASONING HERE> CRs-Fixed: 2487131 Change-Id: I77c58862e2f05d516d69392c294f359a00d43804