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

Change-Id: I4d4b13bb15cf5fdc1a2956565b30bf046687db72