Merge f714d0082fc047a565597bb0a2f8856afc2e9e27 on remote branch

Change-Id: I319d9a156f895cd286b422a0e5560aa1ca3ab2ca