Merge "494945: added annotations noextend noinstantiate"