The last change needs more discussion and found some edge cases. Revert and make small step-by-step changes. Bug: 73091756 This reverts commit 7fd36d19e3. Change-Id: I89ff52a70cf6a5d6c553afa20f83719e1f9eb726
7fd36d19e3
383a7d432f
cffe307fa5
2d46e07e48
d5d1718c4a
43699e90f3
e736f83caf
337e2feada
8b35111d3e