Merge commit 'd4d11c5dc8d75ab6fc57ef92ca4b58d59058b117' into HEAD

Change-Id: If3db431348190c57ab1e9008f259c8e99232d353