Merge tag 'v4.9.8' into android-4.9

This is the 4.9.8 stable release