Merge changes from topics "dsu_ashmem", "dsu_clean_up" am: 417aed2c61 am: 1975c67bdb
am: b2bc8f41a6

Change-Id: I7b4d6f8a4f8ace9afc83d96a3e9afd1a7132e0cf