Merge f40034e3115bd26c8f6c3e5552f6952af0a802ad on remote branch

Change-Id: Ifc1d6b9c5b479a82fbf4424f55ce7935cc0457c6