Merge "gts: ro.product.first_api_level needs to be set to L (23)" into nyc-mr2-dev