Merge \\"Don\\'t count zero width space in hasGlyph layout\\" into nyc-mr1-dev am: f9c8893d1b
am: 3fabee6f41  -s ours

Change-Id: I12897c0e574a16c48ae35f2c48f680d163b3d670