98de773474
This reverts commit e069291ecd.
Reason for revert: Blocked on FW change
Change-Id: Iabf6dee687e499544be5bf895563e57157b0f9e1