Merge "dx: Minor code clean-up"
am: 363daca666

Change-Id: Idd98f6f8468ba2b43447fb5da6eb09c88fc44fdb