Merge "Make dx code re-entrant" am: fd96c4d921
am: c796682cca

Change-Id: I4e5e8f1e636df9fb891703444fecdb9a2139674e