Story: 2008341 Task: 41242 This reverts commit 27cf71299e. Change-Id: I036a0423263b1a0332415c6403647ae82c9e34c4
27cf71299e