Support for memory tests
am: c1a2764a6e

Change-Id: Ife853a32fa9e52f8993d25167af61dabc7fd64b8