Merge commit 'e6db3dd483747a8f3055c003c706b0c7e7f14db0' into HEAD

Change-Id: I1dc30ae47185eb72a0c0cda05b336c429c20d6de