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

Change-Id: Ie28ab673ec855738e26ca3ba06a061856ca07045