Merge tag 'v4.9.6' into android-4.9

This is the 4.9.6 stable release

Change-Id: I318df4b9d706d50c13fe3969d734117c25fc94bc