Merge "No need for "and" - ListFormatter adds it" into pi-dev

    <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->

    <plurals name="zen_mode_starred_contacts_summary_additional_contacts">

        <item quantity="one">and 1 other</item>

        <item quantity="other">and <xliff:g id="num_people" example="3">%d</xliff:g> others</item>

        <item quantity="one">1 other</item>

        <item quantity="other"><xliff:g id="num_people" example="3">%d</xliff:g> others</item>

    </plurals>

    <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->