Merge "Move domain_deprecated into private policy" into oc-dev am: 02a101a695
am: 35e09523a5

Change-Id: I728d32563d123fafd7c316f5ea5764a463876757