Merge contrib

Change-Id: Ib1df72d927ed10951f08f789a4a4e45806dd7bc2
Merge "Merge contrib"