Merge remote-tracking branch 'upstream-master' into HEAD am: 6e37ec1ce0
am: 272572bb63

Change-Id: Ica86c43c649579ff7896be418775c357bc1c4cc1