[change] Arrangement Descriptors

Change-Id: I9d8c946908768a1be182f06e10aa28f8d1724f96
Merge "[change] Arrangement Descriptors" into unstable