Merge tag 'v3.4.40' into cm-11.0-new

This is the 3.4.40 stable release

Change-Id: I6eb7a531d9b43d8912a8f51a614e992b237876fc