Merge "ITS: correct first_api_level for Android T" into tm-dev