Merge "Internalize subclasses of Memory"
am: 5fb660930c

Change-Id: I1fc6df9d1c6a195e78e62a6361ad1c9df0e28a8c