Merge tag 'v4.9.9' into android-4.9-aosp

This is the 4.9.9 stable release