Merge "Add descriptions to compat changes."
am: b38db5afe0

Change-Id: I249f6bb781e8a84693c3687dd2895064687c4cd9