Merge "Add repeat support for memory addresses."
am: 803108ad55

Change-Id: I380887aecf9c6b668bf15619bbd24eb628cf8525