Merge "Add test cases for MemoryDealer" am: 566c383bf8
am: aff573f340

Change-Id: I556f9c381681ab725dd9f9db34b877a13e7ca2b4