Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Pass change Id to submit hook Change-Id: I9f0a55b7c9520ecf0eb6541b1a601ccec7d06ffb