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

Change-Id: Idef606658d6370e026a6a7aca216248e4506780a