Adjust contrib location, minor adjustments

Change-Id: I0a962f487ac3362b209422554286e76441daa06a
Merge "Adjust contrib location, minor adjustments"