Merge commit '04c997d0f49f52a4fa5e24e040be1ae14643ef06' into HEAD
Change-Id: I6f356da36d4902dc3d584808adcc475afb442a4c