Merge branch 'stable-3.0'

This merge was done with 'ours' strategy to connect stable-3.0 and
stable-3.1 while keeping the latest fixes on stable-3.1 and not merge
any of the file deletions on stable-3.0.

Change-Id: I1f62b33e7a4bf6ada266729515800e9353df0271