Merge "Fix clipping wrapped Button text" into lmp-mr1-dev

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:measureWithLargestChild="true"

        android:baselineAligned="false"

        style="?android:attr/buttonBarStyle">

        <Button