3.11 updates

Change-Id: I5cfa30b7b9d38db26fcb34eac7a9f2dfa95d982b