I20210118-1800
This reverts commit ca21dda307bceba7c277428b01b091122a9ca168. Reason for revert: Reverting this change until the discussion is finalized on the bug. Change-Id: Ia412b0197ba6b58c1b69498df7e805bc98f2bc94
This reverts commit ca21dda307bceba7c277428b01b091122a9ca168. Reason for revert: Reverting this change until the discussion is finalized on the bug. Change-Id: Ia412b0197ba6b58c1b69498df7e805bc98f2bc94