Merge tag 'v1.6.37' into HEAD

Test: build
Bug: 134761359
Change-Id: Iee93c2907d93430a8de681f2e987d37f4b3b17bc