This reverts commit d7c02619d6. Reason for revert: <INSERT REASONING HERE> Change-Id: I53322718dadde2c98f96140b8e260ec7ee9ef721
d7c02619d6
Change-Id: I30f4e65467613152ce86b80b13e1c9f2928da801
Change-Id: Ieceaafd4d404b137936eb8aceecff27bbba42026
SWDEV-245290/SWDEV-247767 Change-Id: Id52e3d2f7afee52763da107eb5ed04627942d9f0