Merge "Fix local reference leak under reflection."
am: 934adc1dac

Change-Id: Ie0797e58cca40ffca7dab1b1273f5cbe68e33407