Merge remote-tracking branch 'upstream/master' into master am: e21c1459 am: a434cda9 am: 8524c452 am: 886bf762 Change-Id: I2758a0ef89dfd78f39bb43b0a7ce9dd91de6c3bc