Get rid of empty flags

Change-Id: I532865adb349ea87d5ec9567a60f9248ca7b5d9d
Merge remote-tracking branch 'upstream/folsom' into folsom_quantum