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

Change-Id: I5e9df3ff64ab88b76069148421f635f2dab5de5d