Merge "Add descriptions to compat changes." am: fdb5a1ce2a
am: d76cef9f7c

Change-Id: I7eca4097e3c795dab6bd045877ebdc6308bb24d0