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

Change-Id: Id9f4bf1fbd113909631825fa975ccd6aeb5292a9