Merge "DX: minor clean-up"
am: a5df8aeac5

Change-Id: I1e3d60032cee2378306722367db08df40cf955ba