Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev