Merge commit '294a58f3718f38f9e635be3faf76f0a2cdb61508' into HEAD
Change-Id: Icecff4ad44a247727d44030f3796a976621adf1e