Synchronize with dfuntesting.

Change-Id: If2e8d3fd1ccde1a9d0c766e3deb1ee35958367b4