Merge commit '8e1cb842e38e7cd860758a3ce987faaa66219f24' into HEAD
Change-Id: I0a1057405e01fdedc87825f8c5c7cff2e661189b