Revert "resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp"

This reverts commit a1d4787294ff4fbfc875683f16b7ce5710477bd8, reversing
changes made to 991686f99841ccffa04cd0d413440d3dcb3a3cb0.
1 file changed