Merge tag 'v3.4.101' into cm-11.0

This is the 3.4.101 stable release

Change-Id: I62fa6fb7a024547b891a2230e3cfe004e6c93b19