Merge commit '949b3428fcd4bdae1cff4763bbc8727472fd3ccb' into HEAD

Change-Id: I06f54572cdc15eba9aef520a69a20b04051b0742