Merge branch 'stable-2.9' into stable-2.10 * stable-2.9 Remove unneeded 'throws NoSuchChangeException' Change-Id: I9f22d31cd42b23943321a0e321920248ebdca371