Merge tag 'v3.8.0'
am: 1fee05822b

Change-Id: I0e004ec4b4a71e643f96b4c2c6ff0ac24eead9c6