This reverts commit 4c790408b1. Change-Id: I32c48e300e8c641b196210c4412b635e1c1941f0 CRs-Fixed: 2013665
4c790408b1