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

Change-Id: Ie8d9e4d8f43274aa1bba1df66a9f0fda34d0e78b