Merge "Update METADATA to v1.6.37" am: b2f0025d03

Change-Id: I514301f02c849273ba76de4c517132771dfd994d