Merge fd82bf7a39548beb6be7f0ec5d90f6dd194e604b on remote branch

Change-Id: I5f10ee2c173bb35c9bb9175534c7e14b0c051f2d