Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I30b67df2f0ea535d83cea33aa6af6b63911cf815
Update version to 4.0.0-RC2

Change-Id: Id05aee976c859ec456d6e80e8fabc17bfd8d9360
Merge topic 'update_version_rc2' into next

3e6ceec Update version to 4.0.0-RC2