Merge tag 'upstream/1.5.8'

Upstream version 1.5.8

Change-Id: I5bf1048b9a452063e9ccaeafcfbb13924e6caade