Merge "Make "/*@noflip*/ /*@embed*/" annotation work"