Merge changes I4960c4a8,I8cc3c2ae