Merge remote-tracking branch 'origin/upstream/20.0'

Change-Id: If64cd93a2e5da805715b96085dec59e46a95c4d2