Release 1.18.0
Merge remote-tracking branch 'origin/release_1.18.0'

Change-Id: I1a1d608b13fdc691c9bd5ddf5257f0b0de16bc17