Merging with upstream

Change-Id: I1bc49e30a78346c67b65daa5065c6c862c22bfab