Merge fdd7b81846032f22e276a0157138ab15c4c06d79 on remote branch

Change-Id: If9afb6f9bb38724b71c04eab34ce6b7d54574f4a