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

Change-Id: I538b5b4eac31295c0f0942e1e26a7da68976fc9f