Merge dd9704373c817e36624c0e6207159f2dbe573d81 on remote branch

Change-Id: I9e34a69e97053d409ae334985c81003f3d09bd58