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

Change-Id: I10afb98b8ef27bfe2981574187325bae20148186