This reverts commit 7b40358fa3.
Reason for revert: False positive - this works and patch not needed.
bug:109583877
Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f
This reverts commit 7b40358fa3.
Reason for revert: False positive - this works and patch not needed.
bug:109583877
Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f