Merge "Remove BSD dd." am: 75d3592cb9
am: 7f1c526ea9

Change-Id: I5dc1a05b045fc34e1548576a2d59cbf3e1739d2f