Prepare release 4.3.6

Change-Id: I281d76f2492bd03475506cadea793b7eaf63379b