Merge changes from topic "package default_visibility"
am: 4190926e61

Change-Id: I2ef9bbf783a62a491af0fcf2e9969946158b69ff