2a6e364e91
- Follow-up of http://ag/17888303 to remove extra code that didn't get clean up Bug: 209981696 Test: manual Change-Id: I37f68dd52adacfd033eaeaeca52c98a4a06d556d