MB-8804: Add visibility tags

Change-Id: I06b953958d74a6cd40e7ed0bcc21c6131fafc5f5