Merge a45d9b3afbdac1816fb5f97ce4594c60b65f0960 on remote branch

Change-Id: I0fd8d1236b060059ec68a89a5ddfc4d4120bd11b