Merge 682e43d3d35d08eedf25a453515c5bcdd06184e8 on remote branch

Change-Id: Ia4a9c48b7d41c68ed521bb0c7dca2c52521789a1