Merge commit 'a1081715561b15daf2018c74e9aff434f602fcc9' into HEAD

Change-Id: I1da9335d26d418de026c25d59aa6ee43af6d602c