Fix flag position and style

Change-Id: I588681e11cd60a7e22812a7d39715eeb9fa9275d
Merge "Fix flag position and style"