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

Change-Id: I970da1371374bb8893e833d4c8d7629613214888