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

Change-Id: I7c2c318700b57083f501185ee96fddcbf701ab75