Merge commit '50eded87955cfc04849d424399c030c9ec6c1785' into HEAD

Change-Id: If7f5402402b09d537b2325487bcf88a6144b13dd