Merge "Merge "Add descriptions to compat changes." am: b38db5afe0 am: d54f52b9ea am: 76ba40cc64"