Merge commit 'eef62b63889329c342be6a595143761a000a1241' into HEAD

Change-Id: I9a60d9c34b283c1514dff0b20993b45c19ff2d9c