Merge "180417: Code inspection does not work when a Lint spelling error occurs" into studio-1.4-dev