Merge "Use framework-annotations-lib"