Editor expander changes
am: 1c6298b67f

Change-Id: Ic2a545e5344bcae36a8d940d9200d1c3ce52c6a4