Merge commit 'f34cfd6a34165ce21fd1369fc89ea7d19dc111a4' into HEAD

Change-Id: I44cd6d99bb6f7c9085995fbe24e488b0adbc368a