Merge tag 'v3.4.95' into kk4.4

This is the 3.4.95 stable release

Change-Id: I2343fa21d3e96f060b44213ca4884948823d624f