Merge "Merge tag 'v1.6.37' into HEAD"
am: 7794b22253

Change-Id: Icd76c301afccd9c4afb39b0d27e84bf39512c81a