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

Change-Id: I72ebf645c756df7aab326669f5ac5e5edbbcc640