Merge "Update bundled annotations to the latest version" into studio-1.4-dev