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

Change-Id: I8019d1f57edce28c8a4872f0a233615d6cc928e2