Fix flags bug for linting. am: 22603b3657
am: 588503810d

Change-Id: I49c7718eb60bf67208866428b648a3115f09c2cb