Merge branch 'stable-5.11' into stable-5.12

* stable-5.11:

Change-Id: Ifdbddcde74dda9895bcdd90f1be201c3ceca2b29