Put stricter flag checks

Also removed a log which gives away flag.

Bug: 312976400
Test: manual
Change-Id: I4a989de8b6b920666aabf0cc9311e28becc4d862
18 files changed