Started preparations for API 20, 21