Merge "dx: Remove a couple of hotspots" am: 48550f711c
am: b27c388cec

Change-Id: I2e8e0a4d9de6e7b2972ee751387d6c83470202a4