Merge "Ellipsized and Non-ellipsized baselines should be same." into nyc-dev
am: afe3cd1aaf

* commit 'afe3cd1aaf71e01b78097be57bf5a2aae266be07':
  Ellipsized and Non-ellipsized baselines should be same.