Merge c2b9b3fe7dce1a9122dfcc37d531f767b63c2946 on remote branch

Change-Id: I90ded4504eae26daa676611e5dedb47aca760d2b