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

Change-Id: Ie5edd0f8aff0a645707387b8bd42b0d695280ef3