Merge 26b8402a3c4c96d20cc533c838a1d45844cb46c0 on remote branch

Change-Id: Ib20ee7078d354c5b9de6c2668cd8a3f7601a88de