Merge commit '61f704a28f9d984eef9ee645a6e4e761130a5609' into HEAD

Change-Id: I7d27a79c89740aa041c42e1396e8bfc89bc1d4f4