Merge changes I68779792,Ide8d210e