Merge "dx: Remove a couple of hotspots" am: 48550f711c am: b27c388cec am: 8adb4750f6
am: 067e9ea629

Change-Id: Icc2e55ed4483487dd8d05cb09e1a7e7bd20b1838