Synchronize with dfuntesting

Change-Id: I641396d4c68c76b7f2a7b243577bb69eeb9c49ae