Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Support comment visibility Change-Id: Ifa68bda154b3402bca04b3de23f628c5c4e69eb8