Kunal Mehta [Wed, 27 Apr 2016 21:26:34 +0000 (14:26 -0700)]
Title: Update conversion functions for LinkTarget interwiki support
Title::newFromLinkTarget() will now take the interwiki component from
the LinkTarget object, and Title::getTitleValue() will pass on the
interwiki part if there is one.
Follows-up
9b1f8b4ca331e45.
Change-Id: If1fecc9d71e58c476d6cebe6164cdc95f183048d
Translation updater bot [Wed, 27 Apr 2016 20:30:11 +0000 (22:30 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I8e0a4883bd78e81a72bfafb8b7813dc45799e0f3
jenkins-bot [Wed, 27 Apr 2016 20:19:39 +0000 (20:19 +0000)]
Merge "Enforce calling HTMLForm::prepareForm before displayForm"
Gergő Tisza [Wed, 27 Apr 2016 10:28:55 +0000 (12:28 +0200)]
Enforce calling HTMLForm::prepareForm before displayForm
Bug: T133163
Change-Id: Idd5d117cb0dd65c195019dcd321cd4bf9024b426
jenkins-bot [Wed, 27 Apr 2016 16:19:08 +0000 (16:19 +0000)]
Merge "Add interwiki support to LinkTarget and TitleValue"
jenkins-bot [Wed, 27 Apr 2016 16:00:13 +0000 (16:00 +0000)]
Merge "Add missing imports to MediaWikiServices"
Leszek Manicki [Wed, 27 Apr 2016 14:57:28 +0000 (16:57 +0200)]
Add a type hint to RevDelList::setVisibility
Docblock mentions an array already. All usages in core I've managed
to track also pass in arrays.
Change-Id: I830f446a2b63d09c7aa81205d66ac56d8bdab733
addshore [Tue, 19 Apr 2016 11:55:23 +0000 (12:55 +0100)]
Add getSkinFactory to MediaWikiServices
Change-Id: Ife79aca542e0e85405976de7be7acebfa3359569
addshore [Wed, 27 Apr 2016 10:10:16 +0000 (11:10 +0100)]
Add missing imports to MediaWikiServices
Change-Id: I8d4da075e18a87c5a5084f874c2cdce9eb08237a
Kunal Mehta [Wed, 27 Apr 2016 02:21:59 +0000 (19:21 -0700)]
Add interwiki support to LinkTarget and TitleValue
This adds support to the LinkTarget interface and TitleValue
implementation for having an interwiki component, matching the function
names used in Title.
MediaWikiTitleCodec was updated accordingly.
The motivation behind this change is to be able to fully use LinkTarget
in the Linker rewrite instead of depending upon Title.
Change-Id: I6666b64f0e336aadc7261e7ca87ac2e498c61856
Aaron Schulz [Tue, 26 Apr 2016 22:09:28 +0000 (15:09 -0700)]
Optimize consistencyCheck() in FileBackendMultiwrite
doOperationsInternal() already set "preserveCache" but never actually
filled it in to begin with. This should lower round trips if sync checks
are enabled.
Change-Id: Ica67b8d66e7602faed842408365edbd466688f61
Aaron Schulz [Wed, 27 Apr 2016 03:25:38 +0000 (20:25 -0700)]
Allow for logging cases when parser cache is rejected
Bug: T133659
Change-Id: I779eeffc2ae0533c1929b189a19339a0dc4986f5
jenkins-bot [Tue, 26 Apr 2016 22:12:54 +0000 (22:12 +0000)]
Merge "Introduce InterwikiTest"
jenkins-bot [Tue, 26 Apr 2016 22:02:52 +0000 (22:02 +0000)]
Merge "Update OOjs UI to v0.17.0"
James D. Forrester [Tue, 26 Apr 2016 21:48:42 +0000 (14:48 -0700)]
Update OOjs UI to v0.17.0
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.17.0/History.md
Change-Id: Ie7864c1a7f9f79caa5909fb14345fa054713b49d
Kunal Mehta [Tue, 26 Apr 2016 21:36:24 +0000 (14:36 -0700)]
LinkCache: Make clearBadLink() only clear that link
Calling clear() empties all of mBadLinks instead of the one that was
requested.
Change-Id: Iec7f7845704dd5742b5bdf4aff05678194e08054
jenkins-bot [Tue, 26 Apr 2016 20:46:57 +0000 (20:46 +0000)]
Merge "Make wikidiff3 the only diff engine"
Erik Bernhardson [Tue, 26 Apr 2016 20:07:32 +0000 (13:07 -0700)]
Fix fatal on Special:Search
Icef1ecbe had a mistaken bit of code that called newSearchEngine when
it should have used getSearchEngine. Rename the function call to be
correct.
Change-Id: Id5c8b16b90e1d866d3c8ca31cc622442046da0e2
Max Semenik [Mon, 18 Apr 2016 00:39:25 +0000 (17:39 -0700)]
Make wikidiff3 the only diff engine
In addition to much improved worst-case performance, it also has better
relevance.
Bug: T128896
Change-Id: I3b52c502d7cd5923c5a02942afbe75aba9016148
Translation updater bot [Tue, 26 Apr 2016 20:01:13 +0000 (22:01 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ifece83af145eed33767bd4bc29e373aa00411ae6
jenkins-bot [Tue, 26 Apr 2016 19:30:38 +0000 (19:30 +0000)]
Merge "Have Linker::normaliseSpecialPage() accept LinkTarget objects"
jenkins-bot [Tue, 26 Apr 2016 19:29:06 +0000 (19:29 +0000)]
Merge "registration: Improve schema validation for some properties"
jenkins-bot [Tue, 26 Apr 2016 19:09:36 +0000 (19:09 +0000)]
Merge "OutputPage: Use PageViewLanguage instead of PageLanguage for mw.config"
Kunal Mehta [Wed, 20 Apr 2016 08:43:51 +0000 (01:43 -0700)]
Have Linker::normaliseSpecialPage() accept LinkTarget objects
Change-Id: I762eaaeaf292f014e0443bf3c8fcf621ae8ee254
jenkins-bot [Tue, 26 Apr 2016 19:02:26 +0000 (19:02 +0000)]
Merge "i18n: Provide new "publish" strings for extra translator time"
jenkins-bot [Tue, 26 Apr 2016 18:39:52 +0000 (18:39 +0000)]
Merge "Add missing include in MediaWikiServices"
jenkins-bot [Tue, 26 Apr 2016 18:36:47 +0000 (18:36 +0000)]
Merge "Remove un-needed cast for array key in WatchedItemStore"
jenkins-bot [Tue, 26 Apr 2016 18:19:03 +0000 (18:19 +0000)]
Merge "Convert SearchEngine to service containers"
Brian Wolff [Mon, 22 Feb 2016 22:21:52 +0000 (17:21 -0500)]
Add -f as an alias of --force to cli args of updateCollation.php
Because I kept accidentally using -f without realizing it didn't
work.
Change-Id: I71da15c81ca12c630304f594d144c4c7289ec28c
jenkins-bot [Tue, 26 Apr 2016 14:37:17 +0000 (14:37 +0000)]
Merge "Handle null data return in HTMLForm"
addshore [Tue, 26 Apr 2016 12:49:02 +0000 (13:49 +0100)]
Add missing include in MediaWikiServices
Change-Id: Ib90262bddd59679b1147d3a749fc11b82f791bd8
jenkins-bot [Tue, 26 Apr 2016 03:22:38 +0000 (03:22 +0000)]
Merge "cleanUp all invalid utf8 in sql for debug toolbar"
jenkins-bot [Tue, 26 Apr 2016 03:14:08 +0000 (03:14 +0000)]
Merge "Update hard refresh instructions for Opera"
jenkins-bot [Tue, 26 Apr 2016 03:14:04 +0000 (03:14 +0000)]
Merge "Add @since docs to SpecialPage::getTitleFor"
jenkins-bot [Tue, 26 Apr 2016 02:56:53 +0000 (02:56 +0000)]
Merge "Convert array() => [] in some comments"
Gergő Tisza [Sat, 23 Apr 2016 16:35:15 +0000 (16:35 +0000)]
Handle null data return in HTMLForm
Fix a test in If4e0dfb : in the unlikely but valid case when
some form field object returns null from loadDataFromRequest,
handle it correctly and do not replace it with the default value.
Bug: T133163
Change-Id: Id8b48cfc6288d11a79a5838e72bb80b14137a7b0
Stanislav Malyshev [Sun, 3 Apr 2016 08:37:11 +0000 (11:37 +0300)]
Convert SearchEngine to service containers
Change-Id: Icef1ecbed3d831557e0256fdfa53743b194007cc
jenkins-bot [Mon, 25 Apr 2016 22:50:47 +0000 (22:50 +0000)]
Merge "mw.ForeignApi: Percent-encode dots in the 'origin' parameter"
Kunal Mehta [Mon, 25 Apr 2016 22:48:54 +0000 (15:48 -0700)]
registration: Improve schema validation for some properties
Adds more detailed validation for a few different properties.
Change-Id: Ie379fffcf79b451900a69564d4e80a5b5599ab87
Aaron Schulz [Fri, 22 Apr 2016 21:17:26 +0000 (14:17 -0700)]
Convert array() => [] in some comments
Change-Id: Ibdaf92617f2971aaf977d99c8674b4236ffa5a1f
Aaron Schulz [Mon, 25 Apr 2016 19:14:00 +0000 (12:14 -0700)]
Make $wgEventRelayerConfig docs less confusing
Change-Id: I9fc0e9fe5fa52aa5176067b3390f64adc540f2e4
jenkins-bot [Mon, 25 Apr 2016 21:45:20 +0000 (21:45 +0000)]
Merge "Check for global blocks"
James D. Forrester [Mon, 25 Apr 2016 19:32:17 +0000 (12:32 -0700)]
i18n: Provide new "publish" strings for extra translator time
Bug: T131132
Change-Id: I00f321c903a17d392db7a64927f2980297704acd
Stanislav Malyshev [Sat, 23 Apr 2016 00:09:14 +0000 (17:09 -0700)]
Convert EventRelayerGroup to services infrastructure
Change-Id: If55ddf441de69189c7fcdd3440f899c6b14f690f
jenkins-bot [Mon, 25 Apr 2016 20:48:19 +0000 (20:48 +0000)]
Merge "Make WAN cache config use $wgEventRelayerConfig"
Translation updater bot [Mon, 25 Apr 2016 19:53:10 +0000 (21:53 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I8fd94df7ba904dcae764f5d1286af22f87d94cad
Aaron Schulz [Fri, 22 Apr 2016 19:52:06 +0000 (12:52 -0700)]
Make WAN cache config use $wgEventRelayerConfig
This makes the channels more explicit and defined in a less
ad-hoc way. Systems like Kafka would prefer explicit channel
definitions anyway, so the channel prefix just obscures things.
Change-Id: I5631eb1b1382083396a0f08904d9273cc92601e8
jenkins-bot [Mon, 25 Apr 2016 17:15:16 +0000 (17:15 +0000)]
Merge "mediawiki.special.upload.js: Remove spinner in .always() instead of .done()"
jenkins-bot [Mon, 25 Apr 2016 16:30:23 +0000 (16:30 +0000)]
Merge "Bidi-isolate the comment in history pages"
jenkins-bot [Mon, 25 Apr 2016 15:18:07 +0000 (15:18 +0000)]
Merge "Migration of browsertests* Jenkins jobs to selenium* jobs"
Željko Filipin [Thu, 24 Mar 2016 12:45:36 +0000 (13:45 +0100)]
Migration of browsertests* Jenkins jobs to selenium* jobs
selenium* jobs are a new way of running Ruby based Selenium tests. The
jobs are triggered daily.
Bug: T128190
Change-Id: I927b9be4377de2a972a2ea2a1871cd520595f995
jenkins-bot [Mon, 25 Apr 2016 12:19:21 +0000 (12:19 +0000)]
Merge "Parser: Don't use deprecated Title::setFragment()"
addshore [Mon, 25 Apr 2016 12:18:09 +0000 (13:18 +0100)]
Add @since docs to SpecialPage::getTitleFor
Change-Id: Ia1e75bc50638f9762d03a182fcd146b56f91ae08
jenkins-bot [Mon, 25 Apr 2016 06:28:10 +0000 (06:28 +0000)]
Merge "registration: Allow ActionFilteredLogs to be modified by extensions"
Glaisher [Tue, 19 Apr 2016 13:12:18 +0000 (18:12 +0500)]
registration: Allow ActionFilteredLogs to be modified by extensions
Needed by Ibe628d9d08352
Change-Id: I7788fedc934b7c93facead796af30c89c335a513
jenkins-bot [Mon, 25 Apr 2016 05:01:51 +0000 (05:01 +0000)]
Merge "Fix escaping for MSSQL LIKE queries."
U-REDMOND\emadelw [Tue, 23 Sep 2014 23:23:49 +0000 (16:23 -0700)]
Fix escaping for MSSQL LIKE queries.
MSSQL allows for more operators than standard LIKE queries. In addition,
an ESCAPE clause must be specified in order to backslash-escapes to work.
Bug: T73207
Change-Id: Idadf9d56cadc48cf47d000598d8a3214c684f9d5
jenkins-bot [Sun, 24 Apr 2016 21:48:22 +0000 (21:48 +0000)]
Merge "Add X-Robots-Tag header to Special:Export dumps"
Translation updater bot [Sun, 24 Apr 2016 20:04:46 +0000 (22:04 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ib552061b1052fae52ba0a3c3cba6dfa6a9f20ea0
jenkins-bot [Sun, 24 Apr 2016 19:19:22 +0000 (19:19 +0000)]
Merge "Align to CSS coding guidelines and fix CSSLint errors & warnings"
Amire80 [Sun, 24 Apr 2016 18:20:22 +0000 (21:20 +0300)]
Bidi-isolate the comment in history pages
The comment and the page name are separate pieces of text,
but they can get jumbled in an RTL wiki if the comment has RTL text.
Change-Id: Id49c53ca6a5ec5a7a0b87c297f47e1fbe822d1fc
Andrew H [Sun, 24 Apr 2016 17:59:27 +0000 (17:59 +0000)]
Add X-Robots-Tag header to Special:Export dumps
Adds "X-Robots-Tag: noindex,nofollow" header to Special:Export
dumps so that dumps are not indexed by search engines.
Bug: T91363
Change-Id: Ia96ec40ff185fdfd024312ee3cfe3c736ba8d806
jenkins-bot [Sun, 24 Apr 2016 12:31:13 +0000 (12:31 +0000)]
Merge "Namespace LinkTarget under MediaWiki\Linker"
Kunal Mehta [Sun, 24 Apr 2016 06:27:00 +0000 (23:27 -0700)]
Parser: Don't use deprecated Title::setFragment()
Change-Id: I2b9ea95af288cfe5abc9a1116884a7701f7c36a0
Reedy [Sat, 23 Apr 2016 21:48:30 +0000 (22:48 +0100)]
chmod 664 SpecialSearch.php
Change-Id: I860a4439e34280f19dcd2c7b2a0ce7951503c262
Translation updater bot [Sat, 23 Apr 2016 19:53:14 +0000 (21:53 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I08afd3e2ef249cd2392012537592f33703cbfe4d
daniel [Sat, 23 Apr 2016 19:00:18 +0000 (21:00 +0200)]
Introduce InterwikiTest
This test class verifies that Interwiki currectly handles information
from the database, CDB files, and plain arrays. This is intended to
allow confident refactoring when implementing T113034.
Bug: T113034
Change-Id: I2b68d11e3e946d81fa5f5f65a28fc399e7936c0f
jenkins-bot [Sat, 23 Apr 2016 17:01:32 +0000 (17:01 +0000)]
Merge "Make HTMLCheckField::loadDataFromRequest always return a boolean"
Gergő Tisza [Sat, 23 Apr 2016 16:27:02 +0000 (16:27 +0000)]
Make HTMLCheckField::loadDataFromRequest always return a boolean
Bug: T133163
Change-Id: I4592d9a44c6ca4d3f680a53ecfd628f385a65c09
jenkins-bot [Sat, 23 Apr 2016 16:02:11 +0000 (16:02 +0000)]
Merge "Format count of files on Special:ListFiles as number"
Amir E. Aharoni [Sat, 23 Apr 2016 05:48:58 +0000 (05:48 +0000)]
Update hard refresh instructions for Opera
Change-Id: I41392c9a8ae7b3c2dc52c82f0d66b7e4da764cac
James D. Forrester [Sat, 23 Apr 2016 01:54:13 +0000 (18:54 -0700)]
registration: Explain skipFunction more succinctly
Don't use the RL documentation for skipFunction which is wordy and
not helpful, to be in keeping with the rest of this file.
Change-Id: Ic72672be94537176a9aa0a138052137c9715f7cf
umherirrender [Fri, 22 Apr 2016 20:28:41 +0000 (22:28 +0200)]
Format count of files on Special:ListFiles as number
Change-Id: I712009a0f58e9ebfea6bbfbf401f5e2284714e31
Translation updater bot [Fri, 22 Apr 2016 20:08:03 +0000 (20:08 +0000)]
Merge "Localisation updates from https://translatewiki.net."
Translation updater bot [Fri, 22 Apr 2016 20:05:45 +0000 (22:05 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Idcbc72b595213f1c7637525cfe72eaa88053dd80
jenkins-bot [Fri, 22 Apr 2016 20:05:24 +0000 (20:05 +0000)]
Merge "Fix EventRelayerKafka IDEA errors"
umherirrender [Fri, 22 Apr 2016 19:50:44 +0000 (21:50 +0200)]
cleanUp all invalid utf8 in sql for debug toolbar
Some sql still contains utf8 which is not replaced by ■, clean up this
bytes by using UtfNormal.
Change-Id: I548ffd783536c65b023b1598a5c57fb9b86c6db2
Aaron Schulz [Fri, 22 Apr 2016 19:12:29 +0000 (12:12 -0700)]
Fix EventRelayerKafka IDEA errors
Change-Id: I2808cb3cefb4d97f5ae2650554076c92b0d877d9
jenkins-bot [Fri, 22 Apr 2016 18:50:48 +0000 (18:50 +0000)]
Merge "HTMLForm: Don't render 'mw-htmlform-submit-buttons' if there aren't any buttons"
Fomafix [Fri, 22 Apr 2016 11:52:12 +0000 (11:52 +0000)]
Names.php: Replace remaining tabs and double spaces
Follow-up to
a3552004
Change-Id: I6a76de73fcfc21516fab7415057260e27e924696
matejsuchanek [Sun, 10 Apr 2016 18:41:57 +0000 (20:41 +0200)]
Fix GENDER support in logentry-rights-rights
Introduced in
70f0b0e588e40a18ce53c56a59efcc740f2766d2.
Got to core by my +1, sorry
Bug: T52583
Change-Id: I328fadacf7e5e3b7b250b76556ed585eeba424ca
jenkins-bot [Fri, 22 Apr 2016 16:50:10 +0000 (16:50 +0000)]
Merge "BagOStuff: Optionally log duplicate key lookups"
Bartosz Dziewoński [Fri, 22 Apr 2016 13:32:53 +0000 (15:32 +0200)]
HTMLForm: Don't render 'mw-htmlform-submit-buttons' if there aren't any buttons
Visually, this only affects OOUIHTMLForm, in other kinds of forms
the element has no height anyway.
Change-Id: I90e73c49fbefec23532368848bb30b2e7b69075c
jenkins-bot [Fri, 22 Apr 2016 11:46:16 +0000 (11:46 +0000)]
Merge "Have Linker::linkUrl() accept LinkTarget"
jenkins-bot [Fri, 22 Apr 2016 11:46:12 +0000 (11:46 +0000)]
Merge "Add LinkTarget::createFragmentTarget() function"
jenkins-bot [Fri, 22 Apr 2016 06:54:02 +0000 (06:54 +0000)]
Merge "RELNOTES for Skin::__call unroll & removal"
jenkins-bot [Fri, 22 Apr 2016 06:53:58 +0000 (06:53 +0000)]
Merge "Remove unused Skin -> Linker deprecated methods"
Martin Urbanec [Thu, 21 Apr 2016 18:49:46 +0000 (20:49 +0200)]
Set an alias for TrackingCategories page in Czech
Change-Id: I0c97cf6ce6aa342a50b667b06dc2e78175d9fbc1
Amire80 [Mon, 18 Apr 2016 08:48:26 +0000 (14:18 +0530)]
Unify the spaces before the comment in Names.php
Change everything from a varying number of tabs
to a single space.
The tabs don't really help make it more readable.
Change-Id: Ie84ee675ce4a50f78ec67d3840edc1a19f2c7884
Bryan Davis [Wed, 2 Mar 2016 02:25:55 +0000 (19:25 -0700)]
BagOStuff: Optionally log duplicate key lookups
Add new 'reportDupes' parameter to BagOStuff. This parameter enables scheduling
of a callback after the current web request ends. This callback will emit warning
log messages for all keys that were requested more than once.
The default ObjectCache factory for MediaWiki enables this option by default.
Not by default for plain BagOStuff instances, however. E.g. `new HashBagOStuff()`.
It also set 'asyncHandler' for all classes now (not just MultiWriteBagOStuff).
Bug: T128125
Co-Authored-By: Timo Tijhof <krinklemail@gmail.com>
Change-Id: I8a2b06cf54d2acf5950eed71756ecdf50e224be1
jenkins-bot [Fri, 22 Apr 2016 01:49:11 +0000 (01:49 +0000)]
Merge "Add missing tests for some edge cases in WatchedItem::getNotificationTimestamp"
jenkins-bot [Fri, 22 Apr 2016 01:49:07 +0000 (01:49 +0000)]
Merge "Remove unused JobQueueRedis vars"
Kunal Mehta [Wed, 20 Apr 2016 08:29:21 +0000 (01:29 -0700)]
Namespace LinkTarget under MediaWiki\Linker
And add a GPL file header while we're at it.
Change-Id: I15a6f240124c879b21fb655ade1baaebf4f34ffd
Kunal Mehta [Wed, 20 Apr 2016 08:12:28 +0000 (01:12 -0700)]
Have Linker::linkUrl() accept LinkTarget
This is a private function so it doesn't really make much of a
difference, but will allow further refactoring.
Change-Id: Idacad7b1bd4776c04659ed9af64540d6ce4b2f28
Kunal Mehta [Wed, 20 Apr 2016 08:09:23 +0000 (01:09 -0700)]
Add LinkTarget::createFragmentTarget() function
The createFragmentTarget function allows for switching the fragment on a
target in an easier way. TitleValue already had a now-renamed
createFragmentTitle function (no uses outside of tests), and an
implementation was added for Title.
This will also help with reducing the amount of public usage of
Title::setFragment(), which is deprecated.
Change-Id: I1e8ba2f85e748b1b4394fb2f2a1ccce69cf6e3c5
Volker E [Thu, 3 Dec 2015 01:32:01 +0000 (17:32 -0800)]
Align to CSS coding guidelines and fix CSSLint errors & warnings
Fixes included are:
- Coding guidelines: align colors
- Coding guidelines: put every selector of combined selectors on
one line
- Coding guidelines: use `border: 0` instead of `border: none`
and put border shortcut structure into same order across selectors
for better gzipping
- Coding guidelines: whitespace in parenthesis
- CSSLint: disable applying `margin` for inline elements
- General: clean-up comments
- General: join pagination and 'Generic HTML elements'' rules
- General: add `word-wrap: break-word` to `pre, .mw-code` selector
to aggressively wrap long words
- General: swap `1px` border values with `1pt`
- General: integrate `word-wrap: break-word` on `.external` links
with possible overlong URLs
- General: do the `list-style` shorthand property right.
Bug: T120154
Change-Id: I29bf055e2b4fc0e26ce84243f6b612b4a6214b02
jenkins-bot [Thu, 21 Apr 2016 21:37:40 +0000 (21:37 +0000)]
Merge "TableDiffFormatter: Don't repeatedly call array_shift()"
jenkins-bot [Thu, 21 Apr 2016 21:25:39 +0000 (21:25 +0000)]
Merge "Improve getErrorsByType() docs"
Translation updater bot [Thu, 21 Apr 2016 20:37:42 +0000 (22:37 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: If37acfa27b8f6648209998996ebef2e8bbe83622
James D. Forrester [Thu, 21 Apr 2016 17:36:29 +0000 (10:36 -0700)]
OOjs UI: Correct display of MenuToolGroup checkmarks
Pulling I6b2eeffd forward from next week's release.
Bug: T133227
Change-Id: Ic7adcb78c50ec89071f1efb4e35f42a3809f874b