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

Change-Id: Ibc6827afd0bf0da5fd67222c997ae152946020a3