fbe3b1ebc0
Was reverted to temporarily fix issue #35009 for 2.1. This reverts commit 65ffd0f7190f04dd0a8f94b7941e1ab706b0b084. Change-Id: I71fe094b24f882cd942634557c9c43af06058842 Reviewed-on: https://dart-review.googlesource.com/c/83226 Reviewed-by: Siva Annamalai <asiva@google.com>