c73f6f1a9e
This reverts commit 0615a80f8b.
Reason for revert: Delaying the feature to QPR2
Bug: 270394122
Change-Id: Iefb3550959926ba3430062f8515b265ee8b29bc0