Merge "Oops, unbreak the build by removing Recognition.java, not intended for submission at this time."