Merge "Avoid classifying text mulitple times." into oc-dev
am: d30044407e

Change-Id: Ie6b8c7e95e47c5e382d3f2dab505faee1c03a6e8