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

Change-Id: I6d6fc59c713dde706b3eff725867e508af86603c