Merge changes I36520f38,I59e218b8,Iaf4dc32f,I1c88c888 into 18.11.x