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

Change-Id: Ib24daca60e5b5118f6d3728362b5ce9ed9b9878b