Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD

Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7