Merge "memory leakage: release DLS handles during shutdown" am: 6332521ef3
am: e1d6782e48

Change-Id: Ic7eb5d10786ff384ebb8b4fabe1e877bd98d6e44