Merge changes I4dc6cf5c,I1ad4da22