Merge commit '6311f3130f225f6781b1e4b39c9fca078f8c5800' into HEAD

Change-Id: Ieeaa4b431cacd3db16d9413611abe3564a20cbd1