Merge contrib

Change-Id: Ie724e4b34a660ad63008c57617039aceebd1fed0
Merge "Merge contrib"