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

Change-Id: I8a5e184a8c61e375a2d26237371d68afa9b91b75