Merge "DX: minor clean-up" am: a5df8aeac5 am: 449bae73b3 am: 17bc3fe0ed
am: 40a27c5665

Change-Id: I403c06d7b2a2d54519bcb2c4cc611b95f168fa9e