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

Change-Id: Ib9da312b38da0f3c257a2a0b727ac209dfa1d9aa