Merge 8d46a3c691776bcda7ad0e55c481b41d41235e33 on remote branch

Change-Id: I6a47bb5fc6be5b719a53f432a4755dc7208e62ef