DO NOT MERGE - Updated Contacts expanders to new style

Change-Id: Id84651ffc7d8adcbb7c9c529612e9cfe0384c71c
4 files changed