Merge \"Merge \\\"Delete simple reduction implementation.\\\" am: e8909dc0f4 am: 403aa6e3ec\" into nyc-dev-plus-aosp
am: 7f77a11aa8

Change-Id: I2cde9bb07f58005b80fe5db5de1e41b3f52f9aad