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

Change-Id: I37f1654de3db6bb46dc9d390164e5451182a8d80