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

Change-Id: Iab405e17b33560969ac36e250f5650fea6811889