Merge "Extract an "ArrayMapWithHistory" support class"
am: 472f9b1540

Change-Id: Ie6d8ce05f008796463cfc0e636b8ea7846166f62