Merge commit '15c0fc29253351e7e696bea37fefe999d3b52dfd' into HEAD

Change-Id: I862467f8616ceb051ef0fabf7f3ba32e01f8a34b