Merge remote-tracking branch 'upstream/nightlies' into kitkat