Merge 6395e9e83003dcf31f42b1d246b1a1e188d87934 on remote branch

Change-Id: I96b135c4ea795af828e3b79e9ee80df785e5b655