Danny Tuppeny 8e61a02e14 Cherry pick CrOS fix to beta (#31835)
This cherry-picks fdcc8aafa75eb44ae7732debac1bd8db786c3b9a into the current beta branch. There was a trivial conflict because new tests were added on master in the same file, so the last lines before the tests were different.
2019-04-30 11:16:56 -07:00
..
2019-04-30 11:16:56 -07:00