Merge stable-3.6 into master

Change-Id: I2b322fc6d3ab08b4c937bed9ebbc0eb7d969c49f