Merge "Support profile global restrictions in disclosure messages." into oc-dev am: b258552a1c
am: 12c4d81aaf

Change-Id: Ib6bcd6360b3cd8f0f065c9fad6ba0ec9b7833782