Merge "Internalize subclasses of Memory" am: 5fb660930c
am: 7ad4c6b7f8

Change-Id: Ic0ba267a0bdb081158ae4cc81ec025cc3dba0947