Merge remote-tracking branch 'origin/stable-3.8'

Change-Id: I4cd2adb1dddb262d9bace7236d8a5d5a8d2fce02