Merge ddfa38115b179fb13fcd93405710ad2c8f5c3680 on remote branch

Change-Id: Ic21837969d4f3ddd28a93486d75e9efa6695a78c