Merge 39c111b3a29f0733297c9e475dc5fbff73e72f24 on remote branch

Change-Id: I1f6d9763f8e4e2729e4ea73d4dc201a17fe6ee7f