Merge tag 'v3.7.2' into master

Test: treehugger
Change-Id: I71d4641d4a9c18e7e87709de2b189fafd18733b0