Merge commit 'c3a21abd5624f1d9bce9f3b009c0af408a0c22ec' into HEAD

Change-Id: Ieed88b8053ca3e7249dee5fa8afe4549d39635f1