Try theese flags

Change-Id: I31d2990c7a7bf008542d9604907de255b9908938