Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Apply gjf Change-Id: Id781ccd4b996a0c55a298ff03f66b985f5b5459d