This reverts commit 68c30247. Reason for revert: Hit performance issue b/181814478 Change-Id: I29716dc94796e83b7756c4afe3a78e65a855750e