Merge 283f7bc88009428aef6faa54740b11f0bb159292 on remote branch

Change-Id: I4e27205c78a48f3584f2bc65961190d52cf26aee