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

Change-Id: Iae0f97a038a679d50a719acd9fb9951b53f96a85