Fix flags Credit to vanir team

Change-Id: Iad75a6f0f5842ec33cbe317395407a2d18db7ab2