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

Change-Id: I30938a5684e070401967b7d7d0498efbf7e2ec5b