Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev
am: 15c8747ad9

Change-Id: I1b1c16800319aac6abf8403f168d0b4343293fc0