This reverts commit 32a33dc1. Reason for revert: regression issue found. Change-Id: I48db0b0313477e1f3b6fe97cd4d540dfe16f3963 Bug: 111451066