USE_MEMORY_HEAP_ION

Change-Id: I7e871e93d4f2a6796490b6a6deb1501ed5fe86df
Merge branch 'updated' into HEAD