Merge "Support copying from index8 into another index8." into oc-dr1-dev
am: f112fde96d  -s ours

Change-Id: I28e0f5b34ea30d1a8edaa3858b2bb569612a57e5