Merge b10f47275d9b0ad64e95cc855ce6d47494562471 on remote branch

Change-Id: I48f16e7576ffb5ecf1ff81e20099be5ff3636b56