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

Change-Id: Ib3415a4968a2fad21c9bf19ffd7a4818dd74bae0