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

Change-Id: I88e6fc8b524cdbceb6c07e817a23218771e108d2