Merge c5a0336d080ed8beb5a4684a7dd1d67d38da3906 on remote branch

Change-Id: Ifa58d329c2c71b56a3f819208905c5bcecfa09c1