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

Change-Id: I906748223efd88d5d48889b2866725ba13c0268e