Merge 8a58511b94f23f8d0d5a19f01262b67e0f8dafa8 on remote branch

Change-Id: I0d25ff3d6701b54c63655fb4421823a08d5548c2