Merge da57652d224496482255dbb5005d0cc9ab7eeb90 on remote branch

Change-Id: Ia906f757fc1c968f3888477e1a23105ed18c31d3