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

Change-Id: Ia519e17c87de10afa7e87d380909446bba73bdd7