Fixed two rules which where temporary disabled during introduction of the linter. Change-Id: Icd1e1b40b1e8207ab5ff7088a48e8f0a800e3aa8