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

Change-Id: I4efff61a81cfe135aa74e466043a352790d4738d