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

Change-Id: I8213e557f48d7bbe026a73a3b31c570d0dff369e