upstream 7.22

Change-Id: I33350b2a3aba9a8e9e4aac0c7ac31bd2dc349c93
Merge branch 'contrib'