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

Change-Id: I95731f5b70862a075cb1c316b9894f7e3c645983