Added a couple of flags

Change-Id: I3e7dde842935da0186ca718cec60bcb26c20130f
Merge "Added a couple of flags"