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

Change-Id: I97b5a17e47f1eeeb34f812db34381c41637bcb4e