Merge "New Contact assets" into gingerbread