Merge "Adding IntDef annotations to some flag based properties" into pi-dev