Merge branch 'stable-3.5' into stable-3.6 * stable-3.5: Update gitignore Change-Id: I5383b75f7fa54ab88c968cf6075504a1e44813b0