dop check-in rework.

Change-Id: Idb21dfdbdff76228f9634abc0d1feac6e9e1810b