Update from global requirements

Also, more importantly, get rid of d2to1 references.

Change-Id: I3c51eaf807b8642d9326d110813f62a9b4898d5b