Merge clean up

Get rid of duplicate flag and fix some spacing

Change-Id: Ibe92af1cfd5d1622d86c1d2c8464e6ac684e9d91