Merge dd799e7c64cc2e465795165374a1068b5f500e9a on remote branch

Change-Id: I259e1d7d70e9ba93751a3ff3d166190b702c36e0