Merge "Add more test methods to IMemoryTest" am: 4cd07b6e21
am: b4c725535e

Change-Id: I5a0a3d5603be680e9807d098edae3dab0c884dbc