Reviving the lost gerrit patch - 82800

Patch 82800 was merged, but for some reason it's lost and never
appears in Flow git history

Change-Id: I21db2ba139e1a718d5a1e99c9b032eae776a5f8b