Merge remote-tracking branch 'origin/upstream-master' am: 5f41254b59
am: baa85476cd

Change-Id: I3846aea26ccbe4df666360638813835cec6a090a