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

Change-Id: I3d7c8909aae6c1606c23cfd7a4b22530a141735a