Merge "Use new doccentric flags and attributes in Sharing"