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

Change-Id: I100bb2612d1d9df7b2dfed94a1e39bf6a1271c89