Merge "Remove divider above ExpandPreference." into oc-dev am: abac8823b2
am: 138d38a789

Change-Id: If7bad49dc87322f1b8eb1a507fff2df968ad9af6