Merge branch 'upstream-master' am: 41158505f5 am: 661b17d2d2
am: 7f0edc130f

Change-Id: Iaaa4dad2af1cdf1ab05c1efb228448983799238c