Merge dfd10b29951d02a3ca27fcd5c4535234c3adced5 on remote branch

Change-Id: I97af9d3541a0fa08b03ccbc000754002344679cd