Merge "Made idiom recognition more robust."
am: 17481b5244

Change-Id: Ice39c379ad8830e143c84724e30521adeb1b8dfe