Merge "Add back api= as an attribute to @RequiresApi" into nyc-dev