Merge 0d377f26c926ae0a6266a2939f990ae2ede72a76 on remote branch

Change-Id: I0eae96d1cfdfbea4d4e8bf6b692cd7a48986f9f0