Merge cf4eac65570a43c797a00abb68779f4757426499 on remote branch

Change-Id: I97d0d37c0cfcd199ec2774f5fded03811a105675