Merge branch 'stable-3.8' into stable-3.9 * stable-3.8: Fix compiler warnings Change-Id: I5bf1711945b850e53910ffa4137e212c39eded7c