Story: 2008309 Task: 41201 This reverts commit 910519127d. Change-Id: I77b72a965153e9583d93dee1f3a77d01a57e4ca2
910519127d