Merge changes I9a6c5927,I055eabb8,I81efc98d,Icc5b7830