Merge tag 'v1.8' into xz-java
am: 4ad7198ff9

Change-Id: Ib508c7215f9ca59c2c0c09175e6e9aadc911ab39