Retain keys in Diff::toArray

Change-Id: I193e17579448e91ba53d5d0b27d9f1da270e0d56